Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mon/OSDMonitor: fix output func name in can_mark_out #14758

Merged
merged 1 commit into from Apr 29, 2017

Conversation

xiexingguo
Copy link
Member

Signed-off-by: xie xingguo xie.xingguo@zte.com.cn

@@ -1833,11 +1833,11 @@ bool OSDMonitor::can_mark_out(int i)
float in_ratio = (float)in / (float)num_osds;
if (in_ratio < g_conf->mon_osd_min_in_ratio) {
if (i >= 0)
dout(5) << "can_mark_down current in_ratio " << in_ratio << " < min "
dout(5) << "can_mark_out current in_ratio " << in_ratio << " < min "
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we use __func__ here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem is that we manually output the function name everywhere within this file.
So I perfer to keep pace with others.

But I'll do it if you insist.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please search for __func__ in this source file for more examples.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed. @tchaikov Can you look ,again?

use __func__ macro instead.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Copy link
Member

@liewegas liewegas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks! we'd like to move to func whenever we touch the code as it is less likely to be wrong after a future refactor :)

@liewegas
Copy link
Member

retest this please

@liewegas liewegas merged commit a9bd266 into ceph:master Apr 29, 2017
@xiexingguo xiexingguo deleted the fix-can_mark_out-output branch May 1, 2017 00:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants